PYTHON-5014 Fix handling of async socket errors in kms request #2054
+32
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ShaneHarvey
reviewed
Jan 10, 2025
pymongo/asynchronous/encryption.py
Outdated
| @@ -213,6 +213,9 @@ async def kms_request(self, kms_context: MongoCryptKmsContext) -> None: | |||
| if not data: | |||
| raise OSError("KMS connection closed") | |||
| kms_context.feed(data) | |||
| # Async raises an OSError instead of returning empty bytes | |||
| except OSError as err: | |||
| raise OSError("KMS connection closed") from err | |||
There was a problem hiding this comment.
Doesn't OSError already get handled by the except Exception as exc block? It should hit the _raise_connection_failure line which adds important info to the error message like the host/port/connection timeouts.
ShaneHarvey
approved these changes
Jan 10, 2025
|
I wonder if some of this logic can be removed after the async streams/protocol work is merged? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses the MacOS encryption errors but not yet the Encryption PyOpenSSL errors.
It addresses the Encryption PyOpenSSL error by expanding the regex to include "SSL handshake failed".